commit 15567bc0c61c951197cb392b835678729534de57
author Junio C Hamano <junio@kernel.org> Sat Jul 23 00:51:59 2011
committer Junio C Hamano <junio@kernel.org> Sat Jul 23 00:51:59 2011
tree 8be698fd27be92da0c23a77720987071e73b1d69
parent 708376e8576f6d39b62b27ee9dfe7292c652f728

Autogenerated HTML docs for v1.7.6-345-g5c2f8 

git-mergetool.html

diff --git a/git-mergetool.html b/git-mergetool.html index 63c0700..01848ec 100644 --- a/git-mergetool.html +++ b/git-mergetool.html @@ -414,7 +414,10 @@  </div>   <h2 id="_synopsis">SYNOPSIS</h2>   <div class="sectionbody">  -<div class="paragraph"><p><em>git mergetool</em> [--tool=&lt;tool&gt;] [-y|--no-prompt|--prompt] [&lt;file&gt;&#8230;]</p></div>  +<div class="verseblock">  +<div class="verseblock-content"><em>git mergetool</em> [--tool=&lt;tool&gt;] [-y|--no-prompt|--prompt] [&lt;file&gt;&#8230;]</div>  +<div class="verseblock-attribution">  +</div></div>   </div>   <h2 id="_description">DESCRIPTION</h2>   <div class="sectionbody">  @@ -509,7 +512,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2011-03-20 19:41:42 UTC  +Last updated 2011-07-23 00:49:30 UTC   </div>   </div>   </body>